Merge "Fix harfbuzz build."