Revert "Make default namespace an "alias" for runtime rather than the other way"
am: 916b426a96

Change-Id: If179fb24cb0241615eaf0df58b8e3af83b64dc96