Merge "Use unhidden APIs in ViewCompat"