Remove enroll_2_2 and authenticate_2_2 am: 49120d936c am: 7df4f085f5

Change-Id: Iedd682f8a88241bec75f18b023fa455effc36b45