Merge "Revert "Revert "Convert external/deqp/android/cts to Android.bp"""