Merge "Add explicit dependencies on jni_headers" am: 264cbeebc9 am: c535cf7258 am: 5a37bc2255 am: 4d9c4f815f

Change-Id: Ia382e2341f57c5887379160a0caa1c3761dbffb5