Merge "Copy vendor & odm .map files when using vendor_otatools"