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

Change-Id: I50949a9d3cc65115e12ac76c7d6b2aa7d1040d07