Merge "Updated libkeystore-engine library to be cc_test_library instead of cc_library_shared." into main