am e31f9565: Merge "Remove support for Cupcake kernels."

* commit 'e31f956597f758154a5f6ca7a5793230c8eff936':
  Remove support for Cupcake kernels.