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