Merge "Remove class2greylist from frameworks/base."
am: 32979f03fe

Change-Id: I72f8797be98fe75806535da7b9f277ae68db8d57