Extend ServletModule instead of HttpPluginModule As described in I3b89150d1. Change-Id: Ic91ce95719c6bccc73cc29a2139a2274f20d1939