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

Change-Id: I6d376cc2492ed2969c85a72f4456d3711db2f72a