Fix patch 1/3

Same as https://github.com/crosswalk-project/v8-crosswalk/pull/26. Targeting master instead of next.