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

Change-Id: If6537f3a9f00e5379b2de5db1d8b9712bc20798d