Ensure that debug symbols are sorted.
am: 2e1ec835d0

Change-Id: I27c80ea3fd708db51611fd3c3773d852b9ca7d0c