am 8e87e14d: am f645a02c: Merge "ART: Fix checks for relocation delta"

* commit '8e87e14d559a585840aac499a6fa4113b4dcb6d3':
  ART: Fix checks for relocation delta