Merge "jni: Track debuggerd API changes."
am: d29f144836

Change-Id: I0a538cdcb94c2f79c371df0c60af1e1234279f5b