Merge commit 'bd77d49812bb2eea20151c11041124b6d316c75e' into HEAD

* commit 'bd77d49812bb2eea20151c11041124b6d316c75e':
  Remove a gcc-4.5 compilation warning: bionic/libc/include/../include/stdlib.h: In function 'int grantpt(int)': bionic/libc/include/../include/stdlib.h:138:23: warning: parameter '__fd' set but not used [-Wunused-but-set-parameter]
Merge commit 'b4637f4f1f7a7be75b981d72e3c75a9ae79d1d7e' into HEAD

* commit 'b4637f4f1f7a7be75b981d72e3c75a9ae79d1d7e':
  Atomic/SMP update.  [manual merge to dalvik-dev]

Conflicts:
	libc/arch-arm/bionic/atomics_arm.S
	libc/arch-arm/include/machine/cpu-features.h
Additions necessary for busybox

Change-Id: I46f67991858ca1399f6b28a3a5c286b7f3ef0888

mark this as cyanogen bionic for busybox

Change-Id: I112ae59ca5e4d153d4851d8f80838cd22b03dc98
increasing SO_MAX to 128

while using opencore as the MM framework, additional libraries are getting
 loaded and recently on audioside superblock is implemented which  runs on
CPU and it  requires loadinglibnvmm_audio.so, so combination of all this is
 resulting in an increase in the number of .so's getting loaded while doing
AV playback throughopencore, so we were getting following error while
Av playback.

NvOsLibraryLoad: libnvmm_video.so: Cannot load library: link_image[1962]:
81 could not load needed library 'libnvddk_2d.so' for 'libnvmm_video.so'
(alloc_info[277]:    81 too many libraries when loading libnvddk_2d.so)

The same is happening when using the hwmediaplugins, due to the chain
of vendor-specific media modules

This change fixes above mentioned library loading issue.

Change-Id: Idf4dd595999a594dc18f5fc386507157948cd3b5
Reviewed-on: http://git-master/r/20920
Tested-by: Sanjay Singh Chauhan <schauhan@nvidia.com>
Reviewed-by: Prem Thanekar <pthanekar@nvidia.com>
Reviewed-by: Janne Hellsten <jhellsten@nvidia.com>
Fix pwrite to take a const void* instead of void* for the buffer.

Change-Id: I10b315946b8f8f7e34825410dfef37e0220edbee
update some files to 4.2.2_r1.2
Update libdl to 4.2.2_r1.2
Update libm to 4.2.2_r1.2
Update libstdc++/ to 4.4.2_r1.2
Update libthread_db to 4.2.2_r1.2
Update to use system/core/include 4.2.2_r1.2
Update docs, kernel and Android.mk to 4.2.2_r1.2

from libc
Update some dir from libc to 4.2.2_r1.2

arch-mips (new)
arch-sh (removed)
arch-x86
tools
Update inet and stdio to 4.2.2_r1.2

upstream-dlmalloc
Remove an obsolete jamfile.

Was bionic ever built with jam? Weird!

Change-Id: Iea9a7af8bf46ee8319963e642da48e3bb49f6c60
Update libc/netbsd and libc/stdlib to 4.2.2_r1.2
Use upstream-netbsd from 4.2.2_r1.2
New libbionic_ssp.a from 4.2.2_r1.2
Update libc/string to 4.2.2_r1.2
Update tzcode and unistd to 4.2.2_r1.2