am 8940c0a0: am 97373bbc: am 7cd15614: Merge "system/core 64-bit cleanup."

* commit '8940c0a07f8d6682712e2d2ee387e78096602f99':
  system/core 64-bit cleanup.