Merge "emulator: Build emulator platform images as ARMv7-A"