Merge "Add libcrypto to shared libraries of core/jni" into oc-dev-plus-aosp am: c584a2596e
am: 59410a96ed  -s ours

Change-Id: I883b87ddb6f5d8fb9ffdb31cab12fd4429ececd6