Merge "Clarify the comments some more." into dalvik-dev