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

Original change: https://android-review.googlesource.com/c/platform/build/+/1455015

Change-Id: I98a383e302f881b149fb8aba245f4463e386f362