Merge "Remove dead tests." into dalvik-dev