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

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