Merge "Add explicit dependencies on jni_headers" am: fe579491c1

Change-Id: Ib56f5d2f736ddc6547dcf19f39d173417e58566e