Merge "Revert "Change how Java Bitmaps are accessed in a few places""