Merge "Set parent namespace for linker-namespaces am: ade364b456 am: b4029f1936" into nyc-mr1-dev-plus-aosp