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

Change-Id: I00eb5055971cc4ea7cc18e744c539882171238bb