Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread