Merge "Fix huffman decoder escape sequence length limitation." am: a4d6ca7b07
am: ac56cddd1f

Change-Id: I422463f26359bef0ad3220c9324ceb26fcd1da14