Merge "Add hooks for drawBitmap()."