am 8af310c0: am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

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