Merge "Misc layoutlib fix in preparation of the access change in framework code."