am 51e9956f: am 4e97f656: Merge "Move image classes options from art to AndroidRuntime [art]"

* commit '51e9956fd7ba9a43b7a907e89e9e82aec530fb50':
  Move image classes options from art to AndroidRuntime [art]