Merge "Move linker-namespace functions declarations am: c337cae9ad am: 7c9b3df8ac" into nyc-mr1-dev-plus-aosp
am: 4cb52c3288

* commit '4cb52c328854d3b5be2375bfc32f918d0f42199c':

Change-Id: I931a9224a1d481a747f73f8e2fc1fa838bf7cba9