Roll Chromium 36.0.1985.125

Fix build on Linux with Nacl by adding a default override.
Merge pull request #2210 from darktears/land-crosswalk-7

Roll Chromium 36.0.1985.125