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

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