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

Change-Id: I2db6a95a1e295ea800b29c6018d2badf3138a5cb