Merge "Archive checkvintf in otatools"
am: 20401e3d84

Change-Id: Id0ef525cfc5ebccf34b3d2e74e515c69edaed3f7