Merge changes I9ad9b542,I2a4f4bb0

* changes:
  Fix link-type warning on GLPerf
  Fix link-type warning on GLDual