Add explicit dependencies on jni_headers am: 86d9a592ed am: 9b123643c1 am: ab13a00f9c am: 6a52751a09 am: d30f9b8dac

Change-Id: I69dc23e6afc7b38c8f0852092d57c1350fcc2891