Merge "add make_f2fs to Android SDK build-tools" am: b4131febb3
am: 4afe3c728f

Change-Id: I8fa5a7d914f1d358811a0a6ace30841917bd882e