Merge "Add APEX namespaces in ld.config.legacy.txt." am: 0e964ad1e8
am: dcdbd53a2b

Change-Id: Ic3bdf9742d821c8e97129b61cae85da639eb99a9