Ensure that debug symbols are sorted. am: 2e1ec835d0
am: 390048aed5

Change-Id: I150f3bc9018af681aaa2c4d7ae82b04507ce8b95