Handle unsupported no_config contexts am: b60ae978ad am: d9829199ed
authorMark Adams <marka@nvidia.com>
Wed, 7 Feb 2018 17:44:11 +0000 (17:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Feb 2018 17:44:11 +0000 (17:44 +0000)
am: f35ed9f82c

Change-Id: Ia242886ad683e52ee8216b09e45cbde18588cae2


Trivial merge