Merge "Merge \\\\\\\\\\\\\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts...

Merge "Merge \\\\\\\\\\\\\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\\\\\\\\\\\\" into klp-dev am: dc7357d2 am: 7e6001b9 am: fad42aa9  -s ours am: cf1aed62  -s ours am: 635dddcd am: d0244980 am: 2946f979  -s ours am: b6ba5f90 am: 95e69fe5 am: a3a86e70 am: 77f104a5  -s ours am: 008ae06c am: 5f31e40c" into nyc-mr1-dev-plus-aosp