Merge "Fix encoder partitioned output on ARM"