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