[automerger skipped] Merge "Add dependencies on jni_headers" am: ed38697b9f am: 560de1587b am: 499ad88989 am: 8add686255 am: 7a8224eebc -s ours

am skip reason: Change-Id I06873e61e519b6e54d7325f90231bce732790366 with SHA-1 e32877afcc is in history

Change-Id: I5a51f8f0eb8beae10c1e1303d4d8654eb289dff0