Merge "encoder: Return gracefully from entropy encoding errors"
am: 94f5d3f0f7

Change-Id: I460d6eb6afa66a5b40e9d34dc2f49e0030f11239