Merge "Handle bridge methods correctly in class2greylist."
am: 6f776a0ce4

Change-Id: If59e2ca926b850c323f14bfda0f7583550e88454