native: merge qcom CAF kk_2.7_rb18

Conflicts:
	libs/gui/Surface.cpp
	libs/gui/SurfaceComposerClient.cpp

Change-Id: Ia74796901c9737d776ee7626fcd83254d8217263