Merge "Set the atrace clock to the best available value: boot, mono, or global." into oc-dev