Merge "Bitmap CTS additions for wrapHardwareBuffer."