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

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