am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"

* commit '00e165aed3d53b147b153003b3b9fd3c129ff3c4':
  fix compiler error under FORTIFY_SOURCE=2