Merge "make_f2fs: use -g android by default" am: 9c4ae20f0e
am: 098f8a96cd

Change-Id: I51455b07913aa7c724d3e68671f8b9820372da53