Merge "Get libbase tests working on Windows."