Merge "Add tileModeX/Y attrs to BitmapDrawable, tint to ShapeDrawable"