Bug 936566 - Print mask layers in layers dump. r=nrc

--HG--
extra : rebase_source : cb960d4f8880f9c3fd39fafc8a4c8a21f6a19596
Bug 939950 - Build gfx/2d in unified mode. r=bjacob,ehsan,bas

--HG--
extra : rebase_source : 4776cc15a2de124149624b8297ae0c4953621eae