Merge "add sload_f2fs to Android SDK build-tools" am: 1e6a2ab589 am: 7a7ca35460
am: b7c45d308c

Change-Id: I03727e5ed67710fad3b18de11e47ba1f42efa759