Merge "Add dependencies on jni_headers" am: ed38697b9f am: 560de1587b am: 499ad88989 am: 8add686255

Change-Id: Ie0c4fd4cc3551e33a5966ac1fe45021d1866a104