Merge "iptables: Change locking semantics." am: 7ce69df55d
am: 850b49ca1f

Change-Id: Iedffadc6c8ade9f79e845ca40aa6ed7d5cf81384