am 9dcb2ce4: Merge "Cherry picked debug info fix from upstream MCLinker."

* commit '9dcb2ce463749f7fc6e0876954ae23ba0b104154':
  Cherry picked debug info fix from upstream MCLinker.