Merge "Fix in layoutlib due to some changes in the frameworks."