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

Change-Id: I17305a489ed6e8ef40cfc85a8d1221f95645d129