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

Change-Id: Ibfe280ea5ba3fb7618ea36d7ed9c4760811a7cd7