Merge "Switch to the public NDK API for bitmap"