Patch 3/3 of rebasing to M36

It depends on https://github.com/crosswalk-project/v8-crosswalk/pull/27