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

Change-Id: Ide1eea544f833fbe28211c3a45f6a8a20bba8385