Merge "Fix DexFile error handling to close fd properly." into dalvik-dev