Sort folders according to their hierarchy.

b/10825810

Change-Id: I27ad5ee75df669315e03c9ccc299bfc8eacbb53b
4 files changed