partial revert: 88a644e010125
I did not think that we had switched to cfx_<device>. This makes the most since and conforms the most to aosp standards. We
should just use AndroidProducts to specify cfx_<device>