Merge "Use junit instead of junit4-target"