Add explicit dependencies on jni_headers am: 9cdb2650cf am: a02a781538 am: feee9701e5 am: 05e2df9e99

Change-Id: I202f29bfea0d2c712583bfb3bbbe76867265a1f3