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

Change-Id: I96fc84543149977e7106a3d81fa4abe71785502d