Merge "Add jni_headers to export only jni.h to vendor and platform."