Merge "Let qemu_props service set system properties in ro.emu and ro.emulator"
am: 0b4529239f

* commit '0b4529239f42a828b7549dc00f1dcec8bbe196b2':
  Let qemu_props service set system properties in ro.emu and ro.emulator