Merge "Add explicit dependency on jni_headers"