Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)." am: b86e97b62c

Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1434752

Change-Id: I85e35d0d2e1f369ca4587a0cecce19cbd506b539