Merge "Revert "add make_f2fs to Android SDK build-tools""
am: 15c31de13d

Change-Id: I13f8946019e55760c241fad2ae0ffb1921193178