Merge "Revert "Allow dexopt to follow /odm/lib(64) symlinks.""