am db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev

* commit 'db672b03a2de26127b40dbe50c794b5697b01c37':
  Change how Java Bitmaps are accessed in a few places