Merge changes from topic 'iptables-1.6.1'
* changes:
Android-specific changes for upgrade to iptables-1.6.1.
iptables-restore: support acquiring the lock.
iptables: remove duplicated argument parsing code
iptables: move XT_LOCK_NAME from CFLAGS to config.h.
iptables: set the path of the lock file via a configure option.
xshared: using the blocking file lock request when we wait indefinitely
xshared: do not lock again and again if "-w" option is not specified
Update to iptables 1.6.1.
Revert "Add '-w' option to ip[6]tables-restore"
Revert "iptables: Change locking semantics."
