Merge "Use apex_name for the name of linker namespace" am: 2fa82ebd25

Change-Id: I92d3bdbf307e06d8439d957d779312498c12e20f