Merge "Add comment to android_link_namespaces method"
am: 7e7913cb67

Change-Id: Iaa7062ebf722dc614552849579bcc80cb059d276