Merge "Normalize java source file paths before running "sort -u"."