Merge "core, release: add sload.f2fs for otatools.zip"
am: 10c9f5d9d3

Change-Id: Ic0735affd801275c3c2f91535b8c5dfad7c75981