Merge "make_f2fs: use -g android by default" am: 4d1d32c9a4
am: 12840ffa91

Change-Id: I5a9b0445baabeaf6ee0688846300966ca4d1448a