Fix ODF build issues introduced by package rename

(cherry picked from commit 21925d18fd9527e16a7a7a19ae2ec5f1da4c6e92)
Signed-off-by: Madhan Neethiraj <madhan@apache.org>
23 files changed