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

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