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