Merge branch android-3.10 into android-tegra-3.10

18bab8a BACKPORT: netfilter: Kconfig: get rid of parens around depends
on
536947e UPSTREAM: netfilter: Fix build errors with xt_socket.c

NB: No bug, this is to address compilation errors in some environs

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I86e2516db51e1a90c9f0eafee1a864af06b7e0b8