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

Change-Id: Iaeb6b6ffac5da834f51348f4d482abc3885f0862