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

Change-Id: Id2dac3c29d5304bf8a25bec4b48724baa25fe8a7