Merge "Switch to exfatprogs compatible fsck parameter" am: dfd36fe6b6 am: 79f6bce6ba am: 9d16d7310f

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1441937

Change-Id: I3ae9201729736095edbb29d869b7c8fe2e9308ca