Merge "init: Sort the list of flattened APEX folders to avoid variations"