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

Change-Id: I1d6871294d16444ee50201faf399318869f876bd