Cherry pick the missing patch during rebase

Missed the patches in https://github.com/crosswalk-project/chromium-crosswalk/pull/115, during the rebase.