Fix VTS paths on 32-bit target am: dd716c36f2 am: 93eda4d82a am: 8d2edad108
am: eff0aadfba  -s ours

Change-Id: I5696bd6426725258e1465823cf13b1de73616dcc