Merge "Linker namespace configuration for the Resolv APEX."
am: 2d3ef2a22f

Change-Id: I8762937b9fce9c87f4b12903a5923973238e739d