Merge "Makefile: Pack verity_verifier into otatools.zip."
am: 31543713fc

Change-Id: I94587dc4f80edd61d5d414742513c4360609259f