Fix dex2oat/oatdump cross-compilation. am: e930027
am: 339a8a8

* commit '339a8a8880f1b2637bd321a313bde0999e223b1c':
  Fix dex2oat/oatdump cross-compilation.

Change-Id: I555fcfc5baf45bd2b7ea0b5e71707b3101c9239b