Merge "Add explicit dependencies on jni_headers" am: c0fe0ae29f am: 6963d8e1c8 am: 18f7afccb6 am: 98d4cf4125 am: ed92902c8b

Change-Id: I6269e5e702d4930c86042c1bb1d812853f17c355