Merge "Revert "Propagate SourceDebugExtension information"" am: 5b786dd9af
am: b78be525c6

Change-Id: Ib79ad9f565376af5a98822eba57e8d4a6ab558ee