Make default 64-bit primary, 32-bit secondary

Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5
4 files changed