Merge \"Use vector drawable for small alarm icon\" into ub-deskclock-fantasy
am: fc5e0865c2

Change-Id: I55b0ebfb62d16cf3b14c736abd4b8aa81994d897