Merge "Replace core-junit/junit4-target with junit"