move deskclock back to aosp, at least for now

Change-Id: I3d27c2fbee0f2f32f80b1fb0ffec17b4b826186e