am 80656fb7: am 62a99c0b: Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb

* commit '80656fb71e98aa5aa2f9d7f010f2db4dfc0c9ff5':
  LayoutLib: Handle color state list in methods returning an int.