Roll M36.0.1985.144 into crosswalk-7

BUG=XWALK-3239
Merge pull request #2760 from darktears/crosswalk-7

Roll M36.0.1985.144 into crosswalk-7