Merge "Revert^2 "Add CodeInfo to JNI methods.""
am: b808ddca3d

Change-Id: I19581d94a09bf99da47aed76177a5445a911adf2