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

* commit '412e6f7e294aa56a2c4532155cde6fa9963dbbf0':
  LayoutLib: Update with the new resource map APIs.