Merge "Reland "Allow dexopt to follow /odm/lib(64) symlinks.""" into pi-dev