Merge "Unbreak APK 26 apps running on "O" preview/beta builds." into oc-dev am: 91f674eeda
am: e261ea2195

Change-Id: I184f06046d89a182f505508351bf64f29072467a