Android: Check KHX, GOOGLE, and ANDROID extensions am: 5d9562a8c6 am: efd1deb8d7...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 20:51:25 +0000 (20:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:51:25 +0000 (20:51 +0000)
am: 07405983be

Change-Id: I3ecb39c6b61c793806f00819bfc82501deba81ea


Trivial merge