Merge "Update NDK methods for HARDWARE Bitmaps"