Merge "Clean up warnings detected by gcc." into dalvik-dev