Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea

Change-Id: Ibc27e9196b7bc9328e465a90c685b9c05460718e