Merge "Pack avbtool into otatools.zip."
am: db5fa05429

Change-Id: Iddc58c0c56b1437287e6d00d03cdbdef01f97c74