Merge "Revert "JIT JNI stubs.""
am: 299c1e168b

Change-Id: I3075875cbf985319a52193cba425c9275d7c4e49