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