Merge "C2SoftMp3Dec: fix floating point exception" am: 3992eb958f am: 606c6d5831 am: 46a8c116ad

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1777789

Change-Id: I46199b3f87958c4d3a704e65c6d949c3b54a8e38