Merge "Avoid TREBLE_TESTING_OVERRIDE"