Merge "Add dependencies on jni_headers" am: ed38697b9f am: 560de1587b

Change-Id: Idf1fc1cab46e19b6a38350323c53fe7acd7bd91f