Merge "A generic jni method can be instrumented." am: 289c4e3a10 am: 1b3dd3b5b8
am: 2dc6dfcd4e

* commit '2dc6dfcd4e1570ac1dcbf8d7dfe82b00eb90a4da':
  A generic jni method can be instrumented.