Merge "releasetools: Fix a broken test due to verity utils relocation."