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

Change-Id: Iee2360aee79cb0dac93dc303a0e0c83468232145