Merge "Add explicit dependencies on jni_headers" am: 264cbeebc9

Change-Id: Ida2cb15dec6b680d42e613d8563cb910d2eb7a0d