merge cm/cm-11.0 into kitkat