Merge "Fix skp on 32-bit"