Merge "Revert "Cleanup Bitmap JNI""