Merge "Revert "Set the atrace clock to boot when possible and mono otherwise."" into oc-dev
am: 7fccc2079e

Change-Id: I183fd416c85c85ea1549eae2a417ef0a95b9a5bf