Merge "Remove an obsolete TODO." into dalvik-dev