Merge "Revert^2 "Linker namespace configuration for the Runtime APEX.""
am: 26c140f010

Change-Id: Ib15bd28295d99fa13077d982b582fb483bbf30c0