Merge "Merge "Revert multi-package APK flag to off." into oc-mr1-dev am: 478f94ba7f" into oc-mr1-dev-plus-aosp
am: b58cc177d2

Change-Id: I2b22283307941ba39cc36534dc134b7b59d82624