Merge "Revert "Include com.android.runtime in the "runtime" linker namespace."" am: 22784574fa
am: 9e61e1fed9

Change-Id: I2468badfb5a29a72440152f75fa7673135840f96