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

Change-Id: I17dbc1323605d130d71ede6c1f61f471678ebed2