Merge "LayoutLib: Improve error reporting." into honeycomb