Merge "Add explicit dependencies on jni_headers" am: 3c0c52be3f am: 6e33ee380b am: 5e12eda6d8

Change-Id: I41227334535dd77f1990f90b02873fad0890908b