Android O MR1 Preview 2 (OPP6.171019.012)
Merge "Revert "Move WildcardMatcher into new 'matcher' package""
am: b1b164ac86

Change-Id: I9336148cbd509a33e3c47f16e20d720308faf39f