This commit fixes the encoding/decoding mismatch issue when
ext-partition and ext-partition-type are both turned on in cb4x4
mode.

BUG=aomedia:336

Change-Id: I4d6ad5863c9d3bc8e3a41c259b8b39f130164790