Merge "Fix libnativeloader_test"
am: 865f6df8d4

Change-Id: I1a2803c8e5bdc16bc8101539ab24fcc2ec30f3be