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

Change-Id: Ibbb5c5bea7aabaa88e6ae2eda92be27a8e8a865c