Merge "Let qemu_props service set system properties in ro.emu and ro.emulator"