Merge branch android-3.10 into android-tegra-3.10

b1e553ca1490 android: base-cfg: remove CONFIG_IP[6]_NF_TARGET_REJECT_SKERR
60299a4737b1 android: base-cfg: enable CONFIG_INET_DIAG_DESTROY
edc081f50ff1 UPSTREAM: packet: fix race condition in packet_set_ring
61748a926df0 UPSTREAM: l2tp: fix racy SOCK_ZAPPED flag check in l2tp_ip{,6}_bind()

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 33358926
Bug: 33753815
Change-Id: I55429fbca9d76b29fa90bdc6ffef29d963a62c35