Backout bug 829035 (9da8f50d3750) because of bug 829335

The pixman update is no good and this depends on it.
CLOSED TREE
Backout bug 828789 (bb755890ec69) because of bug 829335

Backout pixman update.
CLOSED TREE