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

Change-Id: I490a69bfad64a45bdc8736cacd4ced83da8c07f9