Merge "system/core LP64 cleanup."