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

Change-Id: I665d35cc2de6c062ec834be08a55e57f82286885