Merge "add sload_f2fs to Android SDK build-tools" am: 1e6a2ab589
am: 7a7ca35460

Change-Id: I9dae159ec85f0c4ea9be45e152f17dff3605b428