Bug 1050086 - Port |Bug 1047267 - Move EXTRA_LIBS to moz.build| to im. r=clokep