Merge branch 'cm-11.0' into kk_mkt
add xt1052 support

Change-Id: I0f4dfdf5085d650eb42ff0f17cffd4b60914fc45