Merge "Add clean step to remove Soong's host copies of libconscrypt_openjdk_jni.so"