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

Change-Id: Ic8f44babea9fc7748654d8c6f16bfa34b7b90334