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

* commit '97373bbc713c52c43e0fa48d0f16466e0a450178':
  system/core 64-bit cleanup.