Merge "Add explicit dependencies on jni_headers" am: a12af50c56

Change-Id: I382e29c3b2e8661ec67702135e64813e6d4c724c