Merge "releasetools: Remove some legacy paths for prop rewrites."