Merge remote-tracking branch 'aosp/upstream'

For 7eac665 to fix b/26880753.

7eac665 [C++] Handle multiple implicit patterns properly
88150d4 [C++] Fix a minor typo
844ff75 [C++] Add a target which builds tsan-enabled kati

Bug: 26880753
Change-Id: I7999a6e8a28361c66e57301641bd13269bd23584