Merge "Add explicit dependencies on jni_headers" am: fe579491c1 am: ea9005e1f5

Change-Id: I9418827e616e351d1355bf98785feddbccd78783