Merge "Revert^2 "Linker namespace configuration for the Runtime APEX."" am: f679c58787
am: 587ebc4bfb

Change-Id: Ic3a97f03bab0768af5e2c4ab1dea573bcae7efc5