Revert CM11,forgot this is AOSP branch :p