Merge "UPSTREAM: iptables: insist that the lock is held." am: c9c53dbd72
am: d6c570e540

Change-Id: If65490d2853ba4cbc8e060525ec48990dd37ec3b