Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()."
am: 0a1e3b6ef9

Change-Id: I2469e802965d3d974ca09a8c911d0d26f09e6700