Remove more namespace pollution (HAVE_FUNOPEN).

Change-Id: I25a64ce39cd7bdd99aa6412413554b96d3cb113e
Merge "Remove more namespace pollution (HAVE_FUNOPEN)."
Remove more namespace pollution (HAVE_TM_GMTOFF).

Change-Id: I9c2d7ffb66127c1b73076f8674ecf29aada0fa38
Merge "Remove more namespace pollution (HAVE_TM_GMTOFF)."
Merge remote-tracking branch 'upstream/master'