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

Change-Id: I65666dfc9df6d4d7cda7b3c2781171e16170ff77