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

Change-Id: I2f90861c7c32f75a1611cc13f0e892195daee747


Trivial merge