Merge "Revert "Convert external/deqp/android/cts to Android.bp""
authorColin Cross <ccross@android.com>
Thu, 16 Aug 2018 00:19:06 +0000 (17:19 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Aug 2018 00:19:06 +0000 (17:19 -0700)
am: 025acc936b

Change-Id: I3ef79e3012d05f2db6b6b6ea8a89d47187e6ac78


Trivial merge