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

Change-Id: Ic097dcc1e177ec3bcde55d26aab7463e1420fba2