Merge "Ensure that AppCompat's setTint calls match the framework" into lmp-mr1-ub-dev