bring up to date

Hi!

This catches the main tree up with with the code in the chromium tree and improves the build slightly to get rid of warnings, etc.