am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

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