Merge "Remove support for Cupcake kernels."