Move common J-Team things to kitkat-mr2