[automerger skipped] Merge "Add product and system_ext partition for emulator"...
[automerger skipped] Merge "Add product and system_ext partition for emulator" am: 1c859937 -s ours
am: ed5c7452 -s ours
am skip reason: change_id Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2 with SHA1 ff3d62d3 is in history
Change-Id: Iacb8d1aa0cf599a4866a4294b5d7c41d96a740cf