Merge "Remove 400-draw case in android.openglperf.cts.GlVboPerfTest" into oreo-mr1-cts-dev