Merge "Remove "StringTest.java"." into gingerbread