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

Change-Id: Ib1813ad6d954d142fadfc43178bf7d6d939fe5f2