Merge "copybit: Avoid NEON instructions in s/w converter on 64bit"