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

Change-Id: Ia93cf524906d598efd67c4ee272d9d5ecf803361