Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 am: 760d127583" into nyc-mr2-dev-plus-aosp
am: 1784848976

Change-Id: I417c5d5f34d9b36cc649679d388e84819d8abbd9