Merge "Freeze compat matrix 7 for Android T" into tm-dev