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

Change-Id: Ic2dde2f6d6dacb3420bd35b511871f41b83a54e1