Merge "[cts][graphics] fix -Wreorder-init-list"