Merge "Use non nostd secretkeeper_* libraries" into main