am 68835ee8: Merge "system/core LP64 cleanup."

* commit '68835ee88b146f654fe3ce007f07ace71266e876':
  system/core LP64 cleanup.