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

* commit 'f597f750392a26e1bc33430ff52e2dd3674c875b':
  LayoutLib: update with Pair API.