Merge "Fix link-type warning on GLDual" into pi-dev
am: f5429018e1

Change-Id: I056a091cd333a8d9da4f741c79eb790b780f8bcd