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

Change-Id: I2c008e6800aa990b48908c492ed63e2dd5c27920