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

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

Change-Id: I78bab79efc1361f9164c5e3757db15f9723a9dee