[target]: Fixing machine Ids for all targets.

Change-Id: Ie9bd2551d65df02b1a617e7de9cb580218ed9b8a
9 files changed