[automerger skipped] Add dependencies on jni_headers am: 8fd625660f am: a25f7792dc -s ours am: 25a23c12b4 -s ours am: 83f9472f12 -s ours

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

Change-Id: I30763ebb963bacac2924ce40fe46f5d2451409e5