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

Change-Id: Icb654857182970b91ec046ed2a20da3aa70e98aa