Merge "Minor fixes." into dalvik-dev