Merge "quantize neon: fix hbd builds"