Merge "Add remaining layoutlib api 15 changes." into idea133