Merge "Configure the full set of libraries for switching back from platform to runtime (aka default) namespaces." am: f5f38698a4
am: 7a43aca708

Change-Id: I613ca518182038828a24f7d7cd3b2473bbe47b68