Merge remote-tracking branch 'kfire/cm-10.1' into cm-10.1-linaro