Merge \\\\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\\\" into...
authorJarkko Pöyry <jpoyry@google.com>
Tue, 22 Aug 2017 17:28:50 +0000 (17:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:28:50 +0000 (17:28 +0000)
am: 5982c681cd  -s ours

Change-Id: Iee63a827b5b71c794f54c800c79b29effb558423


Trivial merge