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

Change-Id: Ie765e262139491ab9fb60bf81277ba6563d12fa4