Merge "Add new mipMap attribute to BitmapDrawable"