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 am: b6ba5f9016 am: 95e69fe5c1 am: a3a86e70d3
am: 77f104a52d  -s ours

Change-Id: Ifd2cc83c7b16a5efaa379f50173177fe52e833f6