Merge "Fix issue 262, vp8cx_pack_tokens_into_partitions_armv5"