This reverts commit db94f2be. Reason for revert: Break 667-jit-jni-stub Change-Id: Ia84a78be8acb62e87f7cd93e43c2967efac8caab