Merge "Add explicit dependencies on jni_headers" am: 3c0c52be3f

Change-Id: I6ff0943de4fb0217518eda76eea0bbd00017bf74