Merge "Clean up formatting of SwiftFileBackend::sanitizeHdrsStrict()"