DO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours am: b136c...
authorJarkko Pyry <jpoyry@google.com>
Tue, 22 Aug 2017 18:17:14 +0000 (18:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:17:14 +0000 (18:17 +0000)
am: 7abaac90df  -s ours

Change-Id: I9ba1ca60b949387f96fcdb564fca538420f91932


Trivial merge