Merge "Revert^4 "JIT JNI stubs.""
am: a43a894705

Change-Id: I384377524d0bfb856212e48c29291cac2510b8a4