Merge commit '3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc' into eclair-mr2-plus-aosp * commit '3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc': Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
Merge commit '3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc' into eclair-mr2-plus-aosp * commit '3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc': Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.