Merge "Revert "Convert external/deqp/android/cts to Android.bp""
authorTreehugger Robot <treehugger-gerrit@google.com>
Wed, 15 Aug 2018 23:48:33 +0000 (23:48 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 15 Aug 2018 23:48:33 +0000 (23:48 +0000)

Trivial merge