Merge "Improve error robustness in arithmetic decoder"
am: ecdec651da

Change-Id: I8e119ac863c88ba9e341716a48ae2717cffe5ae5