am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."

* commit '6e2fb587d71631bd29fdb844a6451d68e2144337':
  LP64: Make 9 patches architecture agnostic.