Bug 939303 - Build content/base in unified mode; r=jst,bzbarsky

--HG--
extra : rebase_source : 93bcb48cd6f8cdeab5aa2cd79f95aaba4790d521