Merge "remove e2fsdroid from windows package" am: 3f05beaeeb am: d14d405884
am: 3b7083ff58

Change-Id: Ibd29769a8681a5bd2f4bc0f7417b02b47311cfb6