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

Change-Id: Iafead004c6f8578e3dc76e0b3ccb06064b10b104