Backout e3f27c43fa50
Backout ad301ed3df01
Bug 935672 - Only use accelerated skia on gonk. r=matt.woodrow