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

Change-Id: Id1de7e9d15899076213035682d8b3b977de43750