Merge "Fix link-type warning on GLPerf" into pi-dev