DO NOT MERGE CP vertex array test and warning fixes
authorJarkko Pyry <jpoyry@google.com>
Mon, 1 Aug 2016 19:40:37 +0000 (19:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 19:40:37 +0000 (19:40 +0000)
am: c63640e53a  -s ours

Change-Id: I006f5d42f1e6e09d50a816b499748431c0970e14


Trivial merge