Merge "Fix dex file leak in oat file manager"