Move the last of our Matcha-specific stuff out of the Tock tree Change-Id: Ieb4e987dc4153bb5e873cc8c7c983db2df2b87d4