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

Change-Id: Icc59012dbfc7820be11a7213d41dcd113627d17a