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

Change-Id: I85a4c546c1091be681a3222ac50cfb98f314d0cb