Merge "Use more idiomatic naming in test code." into dalvik-dev