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

Change-Id: If707e5e64a094b9476d7fed6f818f814e8b4a88a