Merge "Don't depend on libbase result.h" into main