Merge "Use make_f2fs -g android by default" am: fa9165f07b am: eb51baf132 am: 7f635c0bb1

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

Change-Id: I92481ef22189435b0f5ef70992bbd718d752892e