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

Change-Id: Ibb1679f186c6ecfc76b6725ced164da0597c1663