Merge branch 'cm-11.0' into HEAD

Conflicts:
	ui.c

Change-Id: Ic02a53808472095c076b97f70577e956409b6244
minui: add fontcn22

Change-Id: Ic3541d676e9e2d142f3c102018a2159e8b493ce6