Fix the logic for cpu_type
Fix the logic for cpu_type

Check for the presence of cpu_type first.

Change-Id: Ib6b3858be13af3cd9661152589648a5cfd17dda2
(cherry picked from commit aacc1706a6b71f4fb014cac4653279c80a1baa2a)
Linaro/lava-server,Linaro/lava-server,Linaro/lava-server,Linaro/lava-server