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