Merge "Always build the iptables lock when building iptables." am: bb975c0535 am: 73dffad4ba
am: cb3ecb0580

Change-Id: I4a5d167e9e5781b7d1bacd06d8a6d8b15458e717