Merge "Remove unnecessary jni.h"