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

* commit '074ae20882c23a2f2cf24c33888bb97b91e8f49b':
  Make system use patchoat to relocate during runtime.