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

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

Change-Id: I0760bc2019fa5f5ce88b549092f984fd60c59ed7