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

* commit '61e92a026472786ce81f4738e7d77bcad69697b8':
  system/core LP64 cleanup.