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

Change-Id: I319a936a658411bcd62099eb580c19324d3d965d