[google] Merged google/integration into google/main

[Diego Novillo]

This merge brings all the integration patches.  I've also created
a ChangeLog.google-main to separate the changes from both
branches.

Tested on x86_64.


Diego.