Merge "Cleanup native debug interface api."
am: 889e29aae6

Change-Id: I651f59835e67dc17986d8d5b495ae463629724a4