Merge "ART: Clean up checks in CheckProxyMethod()."
am: 82a63734d3

Change-Id: I635cd2e8fa88edec7f5def198568fec0a6cd9650