Merge "AIDEGen: Sorting the content items in iml file for easier debug"