Merge "LayoutLib: extract resource resolution into its own class." into honeycomb