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

Change-Id: I9ec8192fcf3bf3fa180e471648894d6b2e51abc9