Merge "Changes made to compile keystore2_client_tests module with compile_multilib set to first." into main