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

* commit '62a99c0b3bca70262ab205a5688ff69cbbbaee78':
  LayoutLib: Handle color state list in methods returning an int.