Merge "Fix memory leaks relating to timing logger." into dalvik-dev