Merge "Add symlink for sort(1)." am: 95d9665b8f
am: 7cf1889416

Change-Id: Ia14f9de7799a4f665ce20e38cb2d98efd7c858a4