Merge remote-tracking branch 'upstream/cm11.0-2.6.32' into kitkat-aosp