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

Change-Id: I3eeced274be9d4ecaa2e2978d68a773f633a6e7b