Set TARGET_2ND_(CPU|ARCH)_VARIANT properly
am: 2199444cd6

Change-Id: I560c47c54d6f2b1026750489211d2bc366a0935c