Merge "VP[89]_COMMON: remove unused near_boffset"