Merge changes I2814a0b8,I05a7961f into nyc-mr1-dev

* changes:
  ART: Add dex2oat swap-usage parameters
  OatFileAssistantTest: do not relocate image randomly.