[descriptor builder] fix 5.4 build