Merge "Add explicit dependencies on jni_headers" am: 30a7c09fd8 am: 9972104f8a

Change-Id: Id26f658c58947f47ac1b5361e119263dc872618e