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

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