Merge "Revert "Revert "Convert external/deqp/android/cts to Android.bp"""
authorColin Cross <ccross@android.com>
Mon, 20 Aug 2018 17:36:23 +0000 (10:36 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 Aug 2018 17:36:23 +0000 (10:36 -0700)
am: be909a7240

Change-Id: Iacd941bb92b3ca63ef76d42c6a5866f80898ef1f


Trivial merge