Merge "Fix TextViewPRecomputedTextPerfTest"