Merge "[cts][graphics] fix -Wreorder-init-list" am: 7f02363707 am: 6e1b2be2f5 am: a4edc09682
am: 146eb82220

Change-Id: If7d0437329acc3ce02f457dc0d5a88a2b1215c30