Merge "make_f2fs: specify sector size for target image size and missing options"
am: e21b764eb6

Change-Id: If582b09ea80eb21c581a7a2b9099138b4c9dc157