Merge "Update APIs from RotateDrawable change"