Merge "Add explicit dependencies on jni_headers" am: 3c0c52be3f am: 6e33ee380b am: 5e12eda6d8 am: 558f76d378

Change-Id: I740e45eba5e132f7bef1c4544e12b85a7bfe3e28