update repos with aospal's & fix lockclock path

Change-Id: I5b5e5348a7c49e1b5a8d23e849eac1fa28d1f8a9