Merge "make_f2fs: use -g android by default" am: 4cd38430d7
am: f8c230a072

Change-Id: I8b973ffc6a10ab47dc8135d809af79c5419fe52b