Merge "misc: use scandir with alphasort instead of readdir for consistency" am: bfe0f47fe1 am: 057af31198
am: 115cd42002

Change-Id: I30f1f478ea93baf566100dbfbc2112329fbcdf86