Merge "mkf2fsuserimg.sh: support sload_f2fs" am: 2824976d02
am: 07f0a74371

Change-Id: I652d1d17edea5d21cc5232f86495dad3f36975ac