Merge remote linaro/linaro_android_4.2.2 with rqkang/cm-10.1

Change-Id: I27727aadce70904f467d9bb5431dbfadefb7dbf9