Android O IOT Preview 5 (OIR1.170720.015)
Merge "Revert "Move WildcardMatcher into new 'matcher' package""