Merge "Add a copy of lockClocks.sh from androidx"