Merge "use f2fs upstream host to generate image" am: 6a9444152f am: 7c17f07be9 am: 0d864d3704
am: ddfeb74845  -s ours

Change-Id: I72a6598bbcc84bf1a6dd904f4a5cf19d5905dc12