Merge "Add explicit dependency on jni_headers" am: d7b8f6e0fb am: 34c9491836

Change-Id: I2472aedfdefa230faccf9b53dd8d8eb4f7f3eb54