Merge "Fix OatFile leak causing dlopen to return stale OatFile contents" into klp-dev