am b75fe469: am eafdd2cd: Fix emulator builds

* commit 'b75fe4696e847ef49aa9b11693243c00de497808':
  Fix emulator builds