Merge "Fix libnativeloader to correctly link to the platform namespace."