Merge "NEON FDCT updated to match current C code"