Merge "Fixing some logging tests, see http://b/issue?id=2487338" into dalvik-dev