The change causes issues in test-art-target-gtest-jni_internal_test32 This reverts commit c94a61f0. Change-Id: Iecfe3c6874d7b0dd59f10156fe2eb743ab7221dc