Handle unsupported no_config contexts am: b60ae978ad am: 307c716b4e
authorMark Adams <marka@nvidia.com>
Wed, 7 Feb 2018 17:49:12 +0000 (17:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Feb 2018 17:49:12 +0000 (17:49 +0000)
am: d217b05e1c

Change-Id: I7eb2f9039984dfcf4a0d6e5370e40669eb051c85


Trivial merge