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

Change-Id: Ia8a647397563206d38e8df55a3fe0e98219ceecc