am 6c17caab: Merge "Make system use patchoat to relocate during runtime."

* commit '6c17caabccd492226c50605929a0eb9e044cb7dc':
  Make system use patchoat to relocate during runtime.