Merge "fastboot: support f2fs format" am: 21d3840eb3
am: 6c2bfb95ee

Change-Id: I9204686aa7afd835d6b1f8852b7a082a4b3e13be