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

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

Change-Id: Ibe4772f59b9b075b5c4e2a89681ad35ea8ec52b1