Merge branch 'android-3.10' into android-goldfish-3.10

de72e36fcb70 UPSTREAM: crypto: crypto_memneq - add equality testing of memory regions w/o timing leaks
05359192dcc0 UPSTREAM: tcp: tcp_make_synack() should use sock_wmalloc
432986fce6fe BACKPORT: FROMLIST: pids: make task_tgid_nr_ns() safe
0af544097729 ANDROID: check dir value of xfrm_userpolicy_id
1cead52a9b5f UPSTREAM: char: lp: fix possible integer overflow in lp_setup()
ad7edffc4e88 UPSTREAM: x86/acpi: Prevent out of bound access caused by broken ACPI tables
46defe5bddda BACKPORT: ANDROID: Use sk_uid to replace uid get from socket file
bd16fa5f56f8 UPSTREAM: tcp: tcp_make_synack() should use sock_wmalloc
bdc766f46237 ANDROID: keychord: Fix for a memory leak in keychord.
b5c574a489f8 ANDROID: keychord: Fix races in keychord_write.
a023848a1a67 Use %zu to print resid (size_t).
91e275eb53ae ANDROID: keychord: Fix a slab out-of-bounds read.
f8ed15567a7b UPSTREAM: brcmfmac: fix possible buffer overflow in brcmf_cfg80211_mgmt_tx()
060d683dcf6a uid_sys_stats: fix overflow when io usage delta is negative
5a5d227d398c ANDROID: sdcardfs: override credential for ioctl to lower fs

Change-Id: If26624045b2193a42e9a4af4877ed4cd1cacaebf