Merge "Allow for 32-bit VTS builds"