Merge "native frameworks: 64-bit compile issues"