Build LockClock for weather

Change-Id: I871bb7de1b9935ece55a9f396861fd6537e7863c
Merge "Build LockClock for weather" into lollipop