Fix multiarch builds

Change-Id: Ib8ef16d4801666da591864ca72b381df34355e95