Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea am: aab67ba15e am: e04cfb092e am: 3b8eaf98ca

Change-Id: I4c9319ccd0699e04d088d4e27430a2326b70bcfb