Merge "Fix libnativeloader_test"