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

Change-Id: I1623f668184f23467a2d5a755df279669598156a