Merge "Revert "Remove junit from our core image.""