Fix sorting of flagmapping files

Change-Id: I77a674e37c7b9e30381d6b48f2812e94fea41a84
Minor cleanup

Remove unused modules dict.

Change-Id: Ieabffe4450a75beb45a1374b046fa32b65105868
Merge "Fix sorting of flagmapping files"