shutil.rmtree started using os.rmdir in a way that made our tests fail. Change-Id: I59add10d886134af86e1bddec2ba39931c1213cb