Prune class2greylisttest out of general-tests. am: 46123bc825 am: 085eb2fe6e
am: 152fb41ed3

Change-Id: Icaa68a7bb12a6062d58cce33966e77d20eff7af9