Fix merge derp

Change-Id: I2208936324add08d6b4179d7f315da189cf7df0a
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1-sgt7-linaro