Merge "Change deqp APK to cts target instead of cts_v2" into nyc-dev