Merge "Add new "class2greylist" tool." am: 7f0aa734a3
am: 812291cc46

Change-Id: Id5ee125e8a87c2d0a4fe938d01ebd53554323168