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

Change-Id: Ib491eb596eca7011d82bf91338d6d56f1275222c