Port |Bug 920731 and MOZ_FOLD_LIBS=1| to Instantbird. rs=florian

--HG--
extra : rebase_source : a08bc7d359f3620e43e3f10651a3e52c37111d06