Merge "Add explicit dependencies on jni_headers" am: a12af50c56 am: 6a270a4860

Change-Id: I577379ca460e1492e9dcd04707e0ee90300ac996