Merge "Add support for otatools as a snpashot when BUILDING_WITH_VSDK."