Merge "Add dependencies on jni_headers"