Merge "Change MaskableBitmap to AdaptiveBitmap Test: $ make dist -j30 b/35399620"