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

Change-Id: I25d0e4f94d75a1f307a97c161c97e0b6a256d351