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

Change-Id: Id514131231d4f5123322e4d9e0c0f797198cb275