Merge "Revert^2 "ART: Support for SourceDebugExtension""