NXP-13299: add back forgotten super.encodeEnd