Remove TARGET_CPU_VARIANT to fix build

Change-Id: I701243d79627424fc79adf19242c05a40bf6e9f4
Remove capabilities

I have not found the new capabilities function.  I am guessing bionic

Change-Id: Ibdb145a16762cd061ab2cc64c353619afef366da