Merge "Fix text encoding in some macrobench tests"