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

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

Change-Id: Ie4b8fa23a8804261ef7c182296fe96262cc16c4a