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

Change-Id: Id8f177954c585644d0535a44560fa3923780a764