Merge "LayoutLib: misc fix." into honeycomb