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

Change-Id: I6a3c4c15cc9a6b02f8f87a6cbf187fe14274ebb4