Merge "Lose rmdir to toybox."