Merge "Add explicit dependencies on jni_headers"