Merge "Enable 64 bit asm for int->int ColorMatrix"