Merge r357225 from the clang1000-import branch:

Fix the following -Werror warning from clang 10.0.0 in newfs_msdos:

sbin/newfs_msdos/newfs_msdos.c:181:2: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation]

if (o.align) {
^

sbin/newfs_msdos/newfs_msdos.c:179:5: note: previous statement is here

if (argc < 1 || argc > 2)
^

MFC after: 3 days