Merge "Add command line flags to enable lock profiling." into froyo