Merge "Move sort headers out of directory layout." into nyc-andromeda-dev
am: 0fbb22908f

Change-Id: I7e0a6e5dbb8da11ed05a3fee5aa2cd591c0818a9