am 68c3de89: am df9cce64: Merge "Allow multichannel FLAC files"

* commit '68c3de899f822acf3c735c681d206e852ad3821f':
  Allow multichannel FLAC files