Merge "Cleanup native debug interface api."