DO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours am: b136c...
authorJarkko Pyry <jpoyry@google.com>
Tue, 13 Sep 2016 20:11:42 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 20:11:42 +0000 (20:11 +0000)
am: 6627462063  -s ours

Change-Id: I29b89ebb87e68e9b28cc5032386bc2b78c0b471b


Trivial merge