Merge changes I76cb1ea5,Ia7e02c34

* changes:
  Fix link-type warning on GL2JNI
  Fix link-type warning on GLJNI