am fbd686b0: am a1ae75c8: am 2876ff6b: Merge "emulator: Move platform-specific modules to development.git"

* commit 'fbd686b031afa84ffc8ca055a91d0f0732dccf62':
  emulator: Move platform-specific modules to development.git