Bug 942334 - Build hal in unified mode; r=cjones

--HG--
extra : rebase_source : b3fae3b4456bfa8ef9920038668b403cc7c8accf
Bug 942486 - Move PL_ARENA_CONST_ALIGN_MASK out of nsZipArchive.h; r=mwu

--HG--
extra : rebase_source : 92410d30a1f8ae6d9df4fb6e6b278dc6307460a0