Need to sort in this commit so that the AUTOLAYOUT_END keeps being one
more than the highest-valued enumerator.

Change-Id: I0db7c8ba069808e92589d5c4688632440007163b