Merge "separate the JNI part of the NDK into their own source"