Merge "Yet more timing logger cleanup" into dalvik-dev