am 9fe7014d: am bfe8e68a: am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue"

* commit '9fe7014d056ac6478069d6f2e946ddbe2863d576':
  Fix build with gcc-4.8 and array boundaries issue