am 8b79abfb: am c2be68e4: Merge "Remove gcc 4.9 workaround."

* commit '8b79abfb4458193ee28949882a712b03e7828c53':
  Remove gcc 4.9 workaround.