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