Merge "Makefile: Pack e2fsdroid into otatools.zip." am: bb6935051a am: ca95ee0465
am: da855a7081

Change-Id: I82755a18d863ae3cb6b0a8fb4542ded3f5b8e08b