Merge "LayoutLib: fix some issue with resource resolution." into honeycomb