am bfc5b96c: am 09f842b0: Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev

* commit 'bfc5b96c326a6321f167a59de4a201e2b61f5ca4':
  The software FLAC encoder now properly signals an error if client