This reverts commit 13e8ca9e. Bug: 30109642 Test: dx/tests/run-test 133-source-debug-extension Change-Id: Iaeab1c3da0379338877258edd655f3632be6de8d