Merge "Minor tweaks." into dalvik-dev