am 7cd15614: Merge "system/core 64-bit cleanup."

* commit '7cd1561410473c71d40cec822fb53a282b5b3279':
  system/core 64-bit cleanup.