Merge "jni: Track debuggerd API changes." am: d29f144836 am: d82212700e am: 22c8e22640
am: 23fcf33946

Change-Id: I6f8bd889be61ce656b5f9f85c6aa8bb050ffffbc