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