Merge "Work around is64BitInstructionSet non-SDK api"