Merge remote-tracking branches 'linaro/linaro_android_4.2.2' and 'rqkang/cm-10.1' in cm-10.1

Change-Id: I7d0139f9c0108d21d932264ca20a6366544eac79