Remove enroll_2_2 and authenticate_2_2 am: 49120d936c

Change-Id: I047fca5d09be481975ef1278f5cae7005f6db0bd