am c56857b4: Merge "Fix calculations for an obscure combo of MPEG audio options." into jb-mr1-dev

* commit 'c56857b4cd12cd4bc3361e375f5b7554277ce9d7':
  Fix calculations for an obscure combo of MPEG audio options.