Merge "Add dependencies on jni_headers" am: ed38697b9f

Change-Id: Iea2c5fb12ea7b1ad563f540349063fcda557fbc1