Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev
am: cebe432650

Change-Id: Id5d81c128f6e96bef732508b8a50bad35f3cb298