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