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

Change-Id: I3258e0fd12a859fdf307b854fe0a1af6cc0250c0