Merge "Fix stupid copy-paste error." into dalvik-dev