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

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