Merge "add make_f2fs to Android SDK build-tools" am: ea2eb3b92a
am: ce37c10e23

Change-Id: Id898187c50ec27330534f60dac11ce44ebfcc9d0