Merge "Move SwitchCompat to use TintTypedArray" into nyc-mr1-dev