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

Change-Id: Ied4097f663ac0aeee589fe9a1ee3bb7cf8245219