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

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

Change-Id: I9bea1d095f659bc237c41646781679772ba4a86b