Merge "Add comment to android_link_namespaces method" am: 7e7913cb67 am: 70cfd3ae79 am: 02538b1f6b
am: 93c74fe6c0

Change-Id: I7b564fcf6f46843304351f2eec2b175bc2bffb25