Merge \\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\" into marshmallo...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 1 Aug 2016 19:50:44 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 19:50:44 +0000 (19:50 +0000)
am: f0e6d6563c  -s ours

Change-Id: I5bc855696a7dc32c808761aa1aacd7bbaf9534da


Trivial merge