Merge "Fix a few of our FindBugs "high" warnings." into dalvik-dev