Merge "Add libcrypto to shared libraries of core/jni" into oc-dev-plus-aosp