Merge "Fix libnativeloader_test" am: 865f6df8d4
am: 696593fd9b

Change-Id: I31fed2081fbf4c4fd1e55e5ae006f15f5847c15c