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

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