Build LockClock for weather

Change-Id: I871bb7de1b9935ece55a9f396861fd6537e7863c
Temp fix for SuperUser

Change-Id: I46f0417e7996aa3e7dc6d81eee987228bdcbfa24
Merge "Build LockClock for weather" into lollipop
Merge https://github.com/LiquidSmooth/android_vendor_liquid into lollipop