Merge "Remove font symlinks hack"