Merge "Add product property for preopting extracted APKs" am: 4856596dc6 am: d5e2cc0081
am: dd00a6e60a  -s ours

Change-Id: Idb0f598f14f05a60bdf1d35c1661104caaf0bae4