am 6bf02664: am ccaffa8d: Merge "Use char x[] rather than char x[0]."

* commit '6bf02664bbe4955d4818fe308b00ce0d97f38c8f':
  Use char x[] rather than char x[0].