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

Change-Id: I2e1d024a8753071da5dbe098ea67de782ec44488