Merge "system/core 64-bit cleanup."