Merge "Revert "Reenable support for non-PIE executables""