Include base::firewall to get default definitions

Change-Id: Ia73926cd1d7cf5142ef9c1c8657d61b467a7b75a
Merge "Include base::firewall to get default definitions" into production