Merge "More layoutlib api changes." into idea133