Android R Beta 2
Merge "Avoid TREBLE_TESTING_OVERRIDE"