Merge "Revert "Use shared object files for ELF""