Merge "LayoutLib: move asserts around." into honeycomb