Merge "Reenable support for non-PIE executables"