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

Change-Id: Idcf57881c1a26bbea6633924e13b508f51fcab6a