Merge "Trusty doesn't need libbase logging anymore" into main