Add explicit dependencies on jni_headers am: d3583bacfb

Change-Id: I8a04754b7bb891e584d9e7783dcf2e17b21340fc