Merge "Revert "Revert "Convert external/deqp/android/cts to Android.bp"""
authorColin Cross <ccross@android.com>
Mon, 20 Aug 2018 17:21:55 +0000 (17:21 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 20 Aug 2018 17:21:55 +0000 (17:21 +0000)

Trivial merge