Merge "LayoutLib: Correctly resolve ?attr/foo"