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

Change-Id: Id8234d4d1f3e51ac90ab64aba5c2fe268c769dea