Fix VTS paths on 32-bit target am: dd716c36f2
am: 93eda4d82a

Change-Id: Ia9e485cbffac90a1c0496b4222e1f459fea78340