Merge "Unsigned Integer Overflows in mpegSurroundDecoder_Parse()." am: e8b5674a5f
am: d200c4e938

Change-Id: I8cb790054357f6c9d81e5b327fabb421d9479ebb