Merge "Add e2fs tools to Android SDK build-tools" am: 62e2d4b346
am: 253b222161

Change-Id: Iea87e279284ac93e8e2a1f0baffe376d6e35381e