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

Change-Id: I821cf6a0ae0aae8d41cb014e41aed8f651267561