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

Change-Id: I08f0b0affe8f7cb9bc12dd258d3e9d7db2421c49