am 361d6148: Merge "LayoutLib: Update with the new resource map APIs." into honeycomb

* commit '361d614822fcda456ba80f166e5d97447adb7e79':
  LayoutLib: Update with the new resource map APIs.