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

Change-Id: Ib14809f2d0fcdb4cf543e6c715fb47c0d6dbf6aa