Fix bad assumptions around architectures

BUG: 73137180
Test: Local build and boot
Change-Id: Ic4eb25592ad87102bad566c391c37dc089dd6a16
1 file changed