Merge "Revert "Add product and system_ext partition for emulator"" am: 0c55b6d2cb am: 66a0d43db2 am: b3162c117e
am: ac3686da61

Change-Id: I44d21c7a53bb07502d974a78999cd6b97622635f