Merge "arm64: restore relro/now"