Merge "Don't allow JNI headers for vendors"