Make sure we don't create and drop orphans when sorting folders by hierarchy

b/10951485

Change-Id: Ia207516d60c80da6391a4cff678ef26dc45c65e3
1 file changed