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

Change-Id: I3022cc84acaff4a416eb070d98a2d972a0833f08