Merge "Revert "Move WildcardMatcher into new 'matcher' package"" am: b1b164ac86
am: 9ef5ef62ba

Change-Id: Ia5767fe31f24dc097eb8419cf1eba39cd55e0e2b