am 96109cf3: Merge "Add UID and directory for RELRO sharing support."

* commit '96109cf36c3dd44e9ecfe4b810e21e77eaf834dc':
  Add UID and directory for RELRO sharing support.