Merge "Fix VTS paths on 32-bit target"