Merge "Revert "Add CodeInfo to JNI methods.""
am: b275072ddf

Change-Id: I3ac6b36bad8a6b6acec9b379beded7fd69d4fcb4