[automerger skipped] Add explicit dependencies on jni_headers am: d3583bacfb am: b45946b0d8 -s ours am: d70af89ace

Change-Id: I466debad69d1bd6c1d8e51e78fb091de5f9999fd