[automerger skipped] RESTRICT AUTOMERGE SoftHEVC: Handle error in reInitDecoder() skipped: 169e6aca16 skipped: 2a2076c019 skipped: 5573b5a432 skipped: 0de6c45885 skipped: fd2fa97ba1 skipped: 9461f8a7e2 skipped: d861134df9

Change-Id: I2108e7599e05580415d0f59fcc83c77d60a940af