Merge tag 'android-4.2.2_r1' into HEAD

Android 4.2.2 release 1

Conflicts:
	libs/ui/GraphicBufferAllocator.cpp
fix build

*missing from 4.2.2 merge

Change-Id: I1dd9710d41a2d2fb0a8a326a4d64cc6987706eef
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Revert "Revert "Reset compositionType to HWC_FRAMEBUFFER before calling prepare()""

This reverts commit 8109c0889b5281fa04c2c9b1166b452c9bca4f6c.
Merge branch 'jb-mr1' of git://github.com/AOKP/frameworks_native into jb-mr1