update velvet and lockclock

Conflicts:

	proprietary/common/app/Velvet.apk