Merge "Add explicit dependencies on jni_headers" am: 3c0c52be3f am: 6e33ee380b

Change-Id: Id048b5d1a94b0e70d263bb1f743efa4585ea11ac