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

Change-Id: I330c8aa30c3e0957537af90ff1a811bb39f2ef64