Merge "Remove more header symlinks"