Merge "swvenc: hevc: fix the size calculation for portrait encoding"