Merge "Make libcrypto_static apex-available for com.android.neuralnetworks."