Merge "Created libkeystore-engine as cc-library instead of cc-test-library to avoid issues while linking shared libraries with Rust test binaries." into main