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

Change-Id: I1c8ea9dec30643c6e8afcda6df0b857478ab52c2