Remove uses of the 'firewall' module.

We don't use this module in our repository, and references were
breaking tests.

Change-Id: I795284300537275de2382317e6c361d55f9d547b
Merge "Remove uses of the 'firewall' module." into production