I forgot to remove these in the change that stopped building them (eae5902e). Change-Id: I4665fa9f6b9b80c51778d5e82b49406fe56db9a6