Move sort headers out of directory layout.
am: 9de0da60f4

Change-Id: I5a8f41dcc70a30e4caee9f5616e189108b242504