[automerger skipped] RESTRICT AUTOMERGE SoftHEVC: Handle error in reInitDecoder() skipped: 169e6aca16 skipped: 2a2076c019 skipped: 5573b5a432 skipped: 0de6c45885 skipped: fd2fa97ba1 skipped: 9461f8a7e2 skipped: d861134df9 skipped: e400c03497 skipped: cef6223617 am: 03beb7d314 am: c36e6aed34
am: 0e940b849f  -s ours

Change-Id: I83347515f1aab4a658e713e266a76c503baeb3c7