am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '5f56ea8d802b3a7ce5ba8992a84dd3b462676e0e':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]