[google] Merged google/integration -> google/main

[Diego Novillo]

This merge did not bring any code changes.  The only patch merged from
google/integration was the addition of -Wself-assign to c.opt that we
already have in google/main.

Diego.