Merge "Fix link-type warning on GLPerf" into pi-dev am: 1ec25461a4
am: 94d4abbf22

Change-Id: I44c41893a3148010499c9bc0c8b14ad39c08ae2e