Merge "Remove a mostly obsolete comment and fix some formatting." into dalvik-dev