Merge commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993' into eclair-plus-aosp * commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993': Added some more verbose output for AMR formats. Properly fill out the output format.