Merge "Remove "StringTest.java"."