Merge "Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()"
am: a5cf260931

Change-Id: Ib3c4c335ef6bbfdccd4db91b03f5f0cdde7705a3