DO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours am: f840c...
authorJarkko Pöyry <jpoyry@google.com>
Tue, 22 Aug 2017 17:27:45 +0000 (17:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:27:45 +0000 (17:27 +0000)
am: 566787163e  -s ours

Change-Id: If8754e6b9d70403de1e459c62cd15456bde382ea


Trivial merge