Update flags to be consistent with GTalk's

Change-Id: Ibaa6cdc110316139ef0e2fe2fb95b864d28dfb25
2 files changed