This commit fixes 32-bit directory layout regression introduced in 49f0e648. Test: ./tests/run.py Change-Id: Ie6fe1a314e1c380bb35262e04e2b22888b3f4a6a