Merge "Set the atrace clock to boot when possible and mono otherwise." into oc-dev