Merge "Add dependency on jni_headers"