Bug 882520 - Two minor tweaks to the memory reporting paths.  r=bhackett.

--HG--
extra : rebase_source : b6176cd0b0314c2216ccc79f76a34fd558876092
Bug 881724. Remove some unneeded includes from nsHTMLDocument.h. r=ehsan

--HG--
extra : rebase_source : 034382c3663f7c20a35e356a4087d57fcc25eaf7