Merge "Merge "Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev am: cebe4326" into oc-mr1-dev-plus-aosp am: 7a9b7da0"