Merge "Revert "Move WildcardMatcher into new 'matcher' package"" am: b1b164ac86 am: 9ef5ef62ba am: 626019de32
am: 7501f6096c

Change-Id: I848da9940449f2eff0d3d137465a92e54915f87e