Merge "LayoutLib: Update with the new resource map APIs." into honeycomb