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

Change-Id: I066d9f922e4e0b6baad2ce9b6be72e8435f7fc0a