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

* commit 'b30b159f709a94a0fb1d62aa1ed7b0da8a51120d':
  system/core LP64 cleanup.