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