Merge \\\\\\\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\\\\\\" into klp-dev am: dc7357d201 am: 7e6001b97d am: fad42aa98d  -s ours am: cf1aed6258  -s ours am: 635dddcdcb am: d0244980ba
am: 2946f9790e  -s ours

Change-Id: Ib69b1fc31986c9847f1aa7ed47b011b907ad264c