Merge "Deals with android:rotation attribute in layoutlib" into mnc-ub-dev