Add TARGET_CPU_VARIANT needed by AOSP master branch