Bug 997380 - Resolve ambiguous reference to strdup. r=bjacob
Bug 997383 - Avoid using the base namespace since it causes problems in unified builds. r=nical