Merge "Fix incorrect string hash value extension during cross-compilation."