merge linaro/linaro_android_4.2.2 rqkang/cm-10.1

Change-Id: I0979128145099588e719caca5fce509a17722a64