Merge "emulator: get emulator booting am: d665b020f2 am: 0f4de2f8aa" into oc-dr1-dev-plus-aosp