Merge "Properly support ALPHA_8 bitmaps in all drawBitmap() methods"