Merge "Set the atrace clock to the best available value: boot, mono, or global." into oc-dev am: bfe6bf6f31
am: 115d6cd1d7

Change-Id: I11606b0da51b924b2e51b2872cdd652d28e0cc7f