Merge "Plug a resource leak with "finally" and make Object.getClass' return type match Java 6." into dalvik-dev