Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/native into 1.1

Android 4.2.2 release 1

Conflicts:
	libs/ui/GraphicBufferAllocator.cpp

Change-Id: Id60a6580bf5a3ba04f8e1e2b1b950e0b93888166