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 17:45:10 +0000 (17:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:45:10 +0000 (17:45 +0000)
am: 27c4c0770c  -s ours

Change-Id: I3f8cec1cf8e7082c5046c00603ee02414cb4e1a0


Trivial merge