Merge "Fix a test's incorrect expectations." into dalvik-dev