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

Change-Id: Ibaa49c2d1c994e4062fd56cda8a5ed05354a6a69