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

Change-Id: Id0147769c8aca1ad45c9453ccedd38bf257f98cf