Merge "Revert^2 "Linker namespace configuration for the Runtime APEX.""