Merge "ART: Change direct-method overlap detection" am: d9132e2b7d
am: be9cb14cf8

Change-Id: I40c7fbd0be696cd339fd49531689df20d62aea75