Merge "Remove /dev/alarm cruft from uptime."