am 329988c2: am a42e0f50: Merge "arm64: restore relro/now"

* commit '329988c277553621c40bbfff85e9848783992040':
  arm64: restore relro/now