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

Change-Id: I3c76f14de97fae8e35d713a0ea728c2d8c0ae587