Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts...