[automerger skipped] Add dependencies on jni_headers am: 9671164f19 -s ours

am skip reason: Change-Id I54806e51f2d1715ef1c18b0103a8ec5f6b7a540d with SHA-1 b5f1ecbf0c is in history

Change-Id: I14267b43e7c937d844526a7e985d98b29821f963