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

Change-Id: I22bcf52e0457bfb48c078dde6eb2526acfbf2842