am 61af6530: Merge "Remove /dev/alarm cruft from uptime."

* commit '61af6530605e10ca99f066c851436921c0385479':
  Remove /dev/alarm cruft from uptime.