Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 am: 68b2be6105" into nyc-mr2-dev-plus-aosp
am: 60dbafb19c

Change-Id: I9c4fe1812e91fbb37377472602a027a14de039e5