Merge "Fix an out-of-date comment." into dalvik-dev