TARGET_ARCH_VARIANT_CPU -> TARGET_CPU_VARIANT

change over to the AOSP naming convention.

Change-Id: I7c0a5b82d91a7fdd30daab036dc3583840112362