Android: Check KHX, GOOGLE, and ANDROID extensions
authorPyry Haulos <phaulos@google.com>
Fri, 3 Feb 2017 22:53:24 +0000 (22:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 22:53:24 +0000 (22:53 +0000)
am: 5d9562a8c6

Change-Id: I3149f91b93dad8801cc0e4fa05e9c19aaf2d4984


Trivial merge