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

Change-Id: I34fa5985cc9efbd473ec5c136e0d77c03a13d8fc