Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb