Merge "Remove support for app JNI workarounds."