Merge "hardening: eliminate more .text relocations"