Merge "Fix TypefaceTest#testMultithreadCacheStressTest"