Merge "Remove dx's copy of JUnit."