am 8ad9909a: am d11ca4e8: Merge "Revert "Reenable support for non-PIE executables""