Merge "A generic jni method can be instrumented."
am: 289c4e3a10

* commit '289c4e3a10acb6d0250dc25dd42465ca4d08c762':
  A generic jni method can be instrumented.