Merge "Use make_f2fs -g android by default"