Reversed applying patches to android libcore
Ignoring requests to load native conscrypt_jni library - it's linked statically
Fixing compile error