Fix VTS paths on 32-bit target
am: dd716c36f2

Change-Id: I9cfddd95ef66f2deafea39407bd6da6d48280ca6