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

Change-Id: Icd050369762a9880d59653dac29f6e1f7d30ad9f