Merge "resources: Sort keys of foreign-resources.yaml"