Add explicit dependencies on jni_headers am: 86d9a592ed

Change-Id: I45b19a32b1218d4030b5578fc592b17a248ba97d