Revert "NXP-15599: use javax.servlet-api"

This reverts commit b5d8726af4427946bdde90bbad10aeb0bcd9dbc4.