Merge "Some formatting and commenting clean-up." into dalvik-dev