am 115a5dd5: am f597f750: Merge "LayoutLib: update with Pair API." into honeycomb

* commit '115a5dd52cd2aafff76ed1e7bea2f5d860a60c2c':
  LayoutLib: update with Pair API.