Merge "Configure the full set of libraries for switching back from platform to...
Merge "Configure the full set of libraries for switching back from platform to runtime (aka default) namespaces." am: f5f38698
am: 7a43aca7
Change-Id: I613ca518182038828a24f7d7cd3b2473bbe47b68