Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread