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

Change-Id: I77e49ee0558a31f2bdc314faa628231a8f95e870