Merge "Flatten AppCompat class hierarchy" into mnc-ub-dev