Merge "Clean test APIs for Harfbuzz support"