Merge "Revert "Include com.android.runtime in the "runtime" linker namespace.""