Merge "Add explicit dependency on jni_headers" am: d7b8f6e0fb

Change-Id: I629822f820e148b797ba20499155c8cfac39c51e