Merge "Clean up stale cases" into dalvik-dev