Merge changes Ifc7292eb,I1abc142f into main

* changes:
  Sort and deduplicate cfg flags.
  Fix conversion of dependency-blocklist to dep-blocklist.