tree 2c6f664355ffdbcc9ebf41d5c361f0058cb0fe56
parent a54e05aa8d2c4dca042ea924558738adb23ac730
author Nicolas Geoffray <ngeoffray@google.com> 1458750951 +0000
committer Mathieu Chartier <mathieuc@google.com> 1459270021 -0700

Fix dex2oat/oatdump cross-compilation.

Only set the ImtConflictTable when not in AOT, to not mess up
with the image.

(cherry picked from commit 40c68c690546e8c15dcb2de6137e72c74f573a75)

Change-Id: I7bff3a18cc06184ed9d7d63ab433f286884f19e7