Merge "Fix an unaligned memory allocation in HT 4x4 speed test" into nextgenv2