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

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

Change-Id: I6a01df4dfd2d655b649b62a233c56d558042ff65