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

Change-Id: Id1aefea1fa91c78c8fc0bd8893385f270d27f619