Merge "Revert "Use dlopen to load oat files.""