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

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

Change-Id: Ib6032533fcbc77dd2b14134bcae4499e6148f2df