Merge "Fix NDK access to recycle'd bitmaps"