Merge branch android-3.10 into android-tegra-3.10

3724945 net: inet: diag: expose the socket mark to privileged processes.
a6226bb net: diag: make udp_diag_destroy work for mapped addresses.
f7d5f82 net: diag: support SOCK_DESTROY for UDP sockets
d4c5e38 net: diag: allow socket bytecode filters to match socket marks
4a63970 net: diag: slightly refactor the inet_diag_bc_audit error checks.
41e1e3f net: diag: Add support to filter on device index
4bc74f1 BACKPORT: audit: fix a double fetch in audit_log_single_execve_arg()
8c43520 UPSTREAM: ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor
5bc4531 BACKPORT: ARM: 8235/1: Support for the PXN CPU feature on ARMv7

Signed-off-by: Mark Salyzyn <>
Bug: 30956807
Bug: 31161206
Change-Id: Ifc7674b118f99a6ea06706b80bdbf2952be80f87