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

Change-Id: I5b22b1631a12f34fdb08840764eb43afca08412c