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

Change-Id: I8fb24596e1d0ab5669fbe4f06d2b6a5901d8e9d4