Merge "use f2fs upstream host to generate image"
am: 6a9444152f

Change-Id: I74846499dfc5e9c7058571353b442e90fd0ac998