am 1cd740f1: am 1343ec16: am b75fe469: am eafdd2cd: Fix emulator builds

* commit '1cd740f1f07f3a1293c5034c97d977ba699b105a':
  Fix emulator builds