Merge "Add explicit dependencies on jni_headers" am: 3c0c52be3f am: 6e33ee380b am: 5e12eda6d8 am: 558f76d378 am: acae24fb7c

Change-Id: I30537ddaa7aae15e370ee25326994ee782a5bea3