Merge "Make the reason for a test failure more obvious." into dalvik-dev