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

Change-Id: I4b198e07cdf1742aff8a771721021ca6ba28f20a