Merge "Add sanity check in huff_decode()"
am: 3942213f19

Change-Id: I33db3f469583b7490860fb5f79189da6c5519085