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

Change-Id: Ifca0b1e5563e2fa5f1c1e6b35aeb10f7080ace0b