Merge "Revert "power: wakelock: don't set check_done flag if aborting"" into msm-3.0