Merge "Fix JNIEXPORT now people are using -fvisibility."