Merge "Get rid of some inconsistent formatting." into dalvik-dev