omni: more emulator build fixes

Change-Id: I9651a8387378ae4b00a18cacdaac4407d2e25193
2 files changed