Merge "Prevent segvs in JNI." into dalvik-dev