Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	services/surfaceflinger/DisplayHardware/HWComposer.cpp

Change-Id: I6073f963c4d1c821c7e88e0e5cb7507217fa7ff8
Fix some char16_t vs. uint16_t bits

Change-Id: Ie2392098fa6b25f3c0713a7774929e36d824d26f
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>