Merge "Remove bitmap::getBitmapAllocationByteCount"