Merge "Remove unused code." into dalvik-dev