revert to aosp deskclock

Change-Id: I5a6d101f5eedbf014bdb77c17245d98e2c13e453