Merge "Makefile: Pack e2fsdroid into otatools.zip."